a dash of refactoring