Tidied up some code into separate methods
Removed some dead code and pulled shopId feed type and catalogue type params up to config class, and therefore Console cmd line params