Tidy up the code slightly
More tidying and fix remaining tests with mulitpliers