Minor code code cleanup, plus modification to while() loop around poll in