Fixed layout issues

— probably
Cleaning constants declaration

— no define macro
— added static modifier
Renamed enum values to match proper style

— see NY Times guideline