Just did some clean up