Loann & Shane's Refactor