doing some refactorization