Refactor, add some test coverage