Minor style fixes
Remove some unnecessary type constraints
Merge pull request #34 from mbrubeck/cleanup

Minor code cleanup