Refactor; 8