Fixed spacing and tab inconsistencies