Minor refactoring A1