Removed some utterly pointless typedefs.
Removed some stupid whitespace.