Fixed tabbing/whitespace inconsistencies