Added missing argument params (closes #188)
Removed some redundant uses of MUST + tidy