cleaning up, adding comments