Did some random clean up