More speed refactors