Refactor analysis functions to remove code doubling

Currently there is still a lot of code doubling in the analysis functions. Maybe refactoring the functions for mainly refracting or mainly reflecting would be helpful