Cleaned up type conversion a bit
Merge pull request #1 from jakewins/master

Cleaned up type conversion a bit