removed unneeded if tags