Dont some refactoring