Refactor. See details on Trello.