Some Refactoring
some refactoring