Removed all extraneous comments and cleaned up some identation