- Made Factory class a singleton. Minor refactoring to class names &
formating.