Additional refactoring to Program and ErrorHandling class!