just some refactories