Removed typedefs for consistency
Merge pull request #753 from nurupo/master

Removed typedefs for consistency