Variable order style refactoring.
Fixed short names extraction.