Adds comments and renames variables
Merge branch 'release/second_release' into develop