commenting and cleaning up