Fix a derp; Cleanup