Code tidying
Added arginfo so we reflect nicely