Fix tabbing/space issues