Tidied code. Added default poll delay to other location