Solution refactor