Successfully refactored.