Refs #20 Tidying up signatures