Modify order of functions, correct comments.