Fixes to punctutation and indentation