Minor refactorizationals