Made some refactoring job