Various refactors