[Refactor] order each function and add comment with number