Performed some refactoring...