Made some refactoring
Made some refactoring