Code cleanups

This closes #83 and closes #84
7 files changed