Removing unused imports, stale code, and adding/removing whitespaces