Re-indent
Remove unused local variables