Just an advice. The worst you can do is to rewrite code that was working fine. Because hundres hours have been invested in testing. And when you change something all that time goes to garbage . You have to focus on you initial goal and never change it. When you finish and has new great ideas , make version 2.