Removed excess comments, reorganized some code.