- ObjectFactory#create...() methods lookup
- small code improvements