Move more braces; static var name change