Removed some comments. Preparing for the mega-commenting / documenting