formatting changes, dead code removal
Merge branch 'master' of /hd/_git/object_factory