Fix + neaten polling/scrolling options
Clean up code