Refactoring: Change Value Listener