Use return instead of else if