Did some clean up stuff