Removing some old comment, moving some code to be coherent