cleanup... derp... more to come I'm sure