Make attr_reader private, clean up some more code.