indentation and spacing fixes