More Refactors