Refactoring - remove mess
Refactoring