tried some refactoring