Few changes to decouple the polls app