Refactor.
Improved auto completion.