Few printfs cleaned up