Tidied up a few printfs