c++ - Refactor/rewrite code or continue? -

I just completed the complex piece of code that works to envision it; Does, but I feel a bit worried about it and I am considering writing it again and / or restoring it.

I have reason to worry about this code:

1. The class hierarchy is not complicated and clear
2. Some sections have a well (They do many unrelated things)
3. Some sections are used internally by others (they are declared friendship classes) to bypass the layers of abstract for display, But I think they do this by encapsuling
4. Implementation details leakage of some classes (e.g., I changed a map on a hash map first and found myself
5. My memory management / pooling system is slightly trivial and less They are transparent.

They appear like good reasons for the refinery and clean code, support for future maintenance and expansion, but it takes a lot of time. Even with the type of code written completely

So, what does the stackworflow feel? Work on clean codes or features?

I will argue that if you have not redeemed this code again, you have not yet" completed "

I think the better it is, the better it is that you go (You believe that you are testing and following TDD's red, green, refractor method), but do not tell you where it has been given A. You should have to "do".

I would advise you to restart it. However, the practicalists in me give the following warning - the code is "never", so this time its Refracting Timebox (so give yourself one or two hours, pass the tests, and then "For now" Done ") and in every future you touch the code, follow it and every time you check it, you clean the code slightly. Over time, you will clear this code - and in the future, as you go, the process of development, instead of doing a great job at the end of development,