Cleaned definitions