Successfully refactored code.