Change to two spaces.
Fix linting issues.