Make step definition pithier