Refactor to be more Symfony Style

Extensive refactor - make the params / env more straight forward to use
and understand.