Code cleanup and updated readme for polling messages