Be more consistent about style and copyright headers.

That is not a required style.  From the google style guide.

    4.1.3 Empty blocks: may be concise
    An empty block or block-like construct may be closed immediately after it is opened, with no
    characters or line break in between ({}), unless it is part of a multi-block statement (one that
    directly contains multiple blocks: if/else-if/else or try/catch/finally).

    Example:

        void doNothing() {}