Even more c clean up