That's what I've always done. Sometimes I even rewrite the code when I'm typing a part that I can optimize.