Style cleanup and minor refactoring
Made _PRIMITIVE_TYPES const
typo fix
Merge pull request #3 from pavelgj/style-cleanup

Style cleanup