just some refactoring