Performed some clean up