Re-organize/group functions, and add comments