Cleaned up definition.