- Refactored FactoryService to be accessed in the 'standard' static
fashion
- Serious code cleanup