Just cleaning up the code and removing debug statements.