Intentional refactoring is not a waste of time. I mean you are learning right, both how to refactor and the right way to represent your problem domain. So tha

Intentional refactoring is not a waste of time. I mean you are learning right, both how to refactor and the right way to represent your problem domain. So that is not bad nor a waste of time necessarily. Do the refactor as it will help you create new features later and as you gain experience you will start using the design patterns from the beginning.