Removed extraneous comments, and code cleanup