Comment the code and re-order functions into groups