Refactoring Primitive Obsession