Revert: Tweaks and code cleanup
This commit was not made by 0xD34D.
Think I forgot to git reset after a borked cherry-pick.
Can't let him take the rap for my poor coding :)