Removed superfluous else and only