Clone
Gary Hale
committed
on 18 Jun
Refactor a few things to clean up