Tidy up code a little
Simplify and improve the current polling in HC