Minor refactoring to prepare for upcoming API additions.
release 0.0.3