Refactor with solutions.