cleaning up, removing comments