Merciless Refactoring

See RefactorMercilessly.