Constants header provided. Minor refactoring.