tree 21d9afb080608f7ed84c017908546510131cd6d0
parent 463054516cbab9cc00d4e9b1a5c76229b16a6a50
author Andy Bavier <acb@cs.princeton.edu> 1450905012 -0500
committer Andy Bavier <acb@cs.princeton.edu> 1450905012 -0500

A bit of reorganization and cleanup