Various formatting / coding errors

Some coding errors not detected by Github's editor.