rewrite methods with keyword parameters, remove short options, standardise  methods