Revert "Tweaks"
Merge pull request #3 from neontribe/revert-2-tweaks

Revert "Tweaks"