Wonderful refactor