Refactor like crazy