Comments, code simplification