Adding semicolons so indentation works properly. Other small space adjustments