Simplified Order Class & Responsibilities Per Review Feedback