This is how I do it as well. I usually find inspiration that makes my code much better. My secret sauce is telling others I am debugging it instead of making a new draft. This keeps someone from insisting that my first draft is "good enough."

In addition, I design my programs such that I can confidently rewrite important sections. This is OOP encapsulation's main purpose. In practice, everyone writes getters and setters until every object is an ugly struct.