remove if else for same return