Clean up my derp