Cleaning up comments, and hardcoded string contants.