Removed extraneous comments and redundant code