Further simplified to just return the static object, rather than making it a variable.  Also cleaned up some comments and formatting.  See #40.
More code cleanup and review tags.  Part of code review, see #29.