Re: Major code cleanup needed?!?!