Tidying up parameters, and the getTargetPace method