Cleaning up code, comments