comments and aesthetics
(#547)