Refactoring Live: Primitive Obsession

Refactoring