Cosmetic code issues

[J-M-Moore]

There are still some variable names in the code that have been leftover from before, e.g. bsm needs to change to simu in some places. But this is purely cosmetic, the code is functional as is.

In general, it would be good to have a complete read-through of all the code changes and check that all variable names etc make sense and are descriptive.