Did some clean up