Code cleanup

This closes #80
11 files changed