comments and indentation clean up