replaced #defines for constants with static const class members wherever possible