Successfully refactored!