Further clean and tidy of Order