Refactor lots