Change indent and tab size to be 2.
Remove redundant file.
Tidy up.