refine domain model for p2pl
model cleanup