Proposing refactoring