Fix a misspelled variable name
Prepend a missing colon

Per #409
Misc. code formatting changes