Cleaning up, adding comments