cleaned up conditions