Minor edits/ removal of printfs