cleaning up commented code and indentation for PR