removed unnecessary elfe if clause