:lipstick: Clean up references, and 'compact' code