Code consistency fixes
Merge pull request #14 from Pronovix/fix/code-consistency

Code consistency fixes