:lipstick: Refactor