stylistic fixes

No functionality changes, just fixes from the byte compiler