cleaned up chained conditions