housekeeping: hidden comments and clean code