Cleaned up some stuff in conditions.