Minimised the requirement to use Some when specifying parameters