Overall, this is a pretty tight refactor guys. Nice job!