Fix Checkstyle warnings

- Fix placement of { on class declaration
- Update ordering of modifiers according to JLS spec
- Don't declare multiple variables on a single line

Change-Id: If8b036e73f37fa1786382bd3fbcc7e303cd5f13d