Improved formatter.
Added Find Usages for variables.