Change polling from 1 sec to 3 sec, refactorings