Cleaning up; commenting