Cleanup

Comments, indentation, whitespace