Removed unnecessary else if