Improved constant names plus coding style and documentation fixes