Fix typo and tidy up tab usage