Refactoring and cleaning ...