Refactor the initial concepts.