moving functions and commenting