Be explicit about default case
Refactor smelly code