fix whitespace, and rollback changes