Constants refactor: public/private constants, replace define (typeless) by real typed constants