Minor code refactorings
More correct code
Code refactoring
Moved code that has nothing to do with short names from short names cache
Faster code for auto-import fix