Implemented TODO : refactor logic to ETLService
Implemented TODO : refactor logic to ETLService
Removed unnecessary, auto-generated TODOs from Eclipse