Cleaning up and commenting