Mostly a speed up and clean up on the code
This will create a new commit in order to revert the existing changes.
