Code cleanup

More work on #97.