Some code style improvements

make enum name and some fixes in code style