Did some refactoring job...