Adding some refactoring...