Some cosmetic fixes, a comment, and deleting a (now) useless printf.