cleaning up/added comments