updated constant names and coding style