Refactor Mercilessly