more indent and spacing fixes