Cleaned up constraints