refactor order content model

Followed DRY principle