Delete author comments, cleanup indentation

Purely cosmetic.

@gsolbeck @Dima4ka @dcfox 

Please delete branch upon pull.