Refactor 2.0

by David DeSandro