Added some refactoring