Tidied autocompletions variables