Minor refactories