The whole first if logic is unnecessary