made some refactors.