tab and spacing fixes