Comment clean-up
Hopefully now more readable