Cleaning up code and deleting comments