Added comments
Initial refactoring to trigger processing from a single class