:lipstick: Code cleanup