More Clean up

Rearranged and commented some code in Melanopsin and Melanopsin2