@Freydal
Updating additional comments and make a few naming changes.
7f452e0