cleaning up, comments