some refactoring is all