Refactorings
autocomplete fix to use timer