- a bit of refactoring to clean code