Minor refactoring of allocations controller