simplify the ~40 lines of code before calls are made to HMF etc
simplify the ~40 lines of code before calls are made to HMF etc