Nothing major, just small improvements to code quality to ease future development.
This will create a new commit in order to revert the existing changes.
