Sort imports
Simplify match branches
Remove extraneous whitespace
Simplify return logic
Clean up if...else block logic
Merge pull request #22 from frewsxcv/cleanup

General cleanup