Code cleanup + Merged a PR.

It somehow didnt really display in the master-branch, however, I did
include the PR that was given to me :)