Use meaningful constant; other minor clarity