Cleanup squad!

I am out of practice! Here's a much less messy implementation!