Made some clean up