Nevermind the branch name, I made a few tiny refactorings and added comments to refresh my memory on what everything does
Merge branches 'refactorJson' and 'develop' into develop