Final touch-ups to logging and removing unnecessary comments.