#44 constants refactored