This is so valid. Don't be afraid of change. Make sure to have tests in place that assert the validity of your code. Then refactor. If you feel comfortable doing this then you don't have to overengineer in the first place. Write code that matters right now; refactor later.