Provision: Minor refactoring