Removed some comments, fixed formatting