did a bit of refactoring