- Did some refactoring