WIP: Cleaner conditionals
FIX: Fix tests
FIX: Fix type
FIX: Minor change
Merge pull request #392 from Eric89GXL/minor-fixes

FIX: Cleaner conditionals