Whitespace and spacing fixes