incorporating Dan's comments for UserMailBox entity redesign and cleaning service classes