Minor refactoring (STOX-10)