Cleaned up unneeded optionals and type conversations.
Merge pull request #2 from RubenSandwich/master

Cleaned up unneeded optionals and type conversations.