refactoring complete
one last little bit of refactoring