Get rid of the singleton_class stuff. Create a builder object for creati...

...ng the accessor methods
Extra empty line detected at body beginning.