:lipstick: Refactor code