Minor spacing fixes and removed semicolons