Solution refactor.