minor adjustments with static const