Removed typedefs for consistency

Waiting on Travis.