cleaning up function names & adding comments
Merge branch 'function-rename'