started some refactoring