Comments and indents
Code simplification