Removed some comments and more cleanup.