Scope to clean up the stretching code

[pbartholomew08]

          I realise the code is copy-pasted into the new module so feel free to ignore my suggestions.

Originally posted by @pbartholomew08 in #314 (review)