Much Improvement

I've been cleaning so much code I should get a sham-wow!