Refactor more and more