cleanup, strengthening polling