#23 cleanups and formatting
Merge branch 'master' of https://github.com/DICE-UNC/jargon