Further refactoring
Use Meteor timeout methods