Initial pass
Remove parens; let the tools fall where they may
Remove a global by defining methods on the class