Change indent and tab size to be 2.
Tidy up.