I replied to you the first time you asked, with a pretty thorough cleanup. Did you have any problems with that code, and if so what where they?

Makeshifts last the longest.