Host code tidying - Device class used throughout.  Delays added in poll loops.