Centralize some more