more tab and space cleanup