Refactor to make the code more findable and logical.