Bug, syntax, formatting and OCD fixes for #225