Removed unused whitespace highlighting, removed other commented out sections, cleaned up formatting and organization