:lipstick: Basic cleanup