i had started doing some cleanup on this a while ago, but will shed no tear should someone want to clean this up more :)