Refactor
Fix spaces in completion for last token