Some minor cleaning up and refactoring (#31).