Minor clean up

• Removed unneeded type definition
• Pointless spacing & renaming