Sounds to me like you just need to get better at refactoring. The first working code for a feature should be a mess because it's a learning exercise. The import

Sounds to me like you just need to get better at refactoring. The first working code for a feature should be a mess because it's a learning exercise. The important thing is that you don't stop there and push to develop; refactor the initial working-but-messy code so that it becomes well structured and self documenting.