Tidy NFW Wave Optics Functions
The recent overhaul to the NFW Wave Optics needed to be reverted due to an error in the overhaul. The reversion does not presently adhere to the functional standard of the rest of the model code. These functions should be looked at in due course for linting and simplification.