Fixes for indentations and inconsistent use of string quoting, close #131.