Change structure of if-statement to silence compiler warnings
Removed extra parenthesis in if condition
Add return value for default case
Omit comparison with NULL value
Preferences: Use <int> types for switch's iso. bool