Poll the service
clean up the code