Massive reformat
Untested attempted fix to address #132 and #134