Refactoring: get rid of the constants module