Small refactor to remove condition
Handle if/elsif/else statements