Refactor solution before merging