SourceFormatter - simplify by keeping things closer to where they are used, or don't declare a var if it's obvious and we can condense some code