Some refactor.
Improved go to symbol.