Cleaned up the requirement definitions for consistency.