Minor cleanup and formatting tweaks to better support the style in mgarin's repository