Minor refactoring regarding optional controle