Changed a few bits of code it was easier to read.
This will create a new commit in order to revert the existing changes.
