Removing debug statements and cleaning up.