Refactor and rescope