Some odd refactors