Added comments are re-ordered functions into groups