Refactoring
Some refactoring