Spacing and Tabbing reported by Travis CI, 2nd pass.