Fixing up lint errors and moving from 4 spaces to 2