SOme cleanup
Fixed EPL factory