OCD

Well, the PR title says it all ;)