minor refactors; playing around with beginning to add test coverage