Aesthetics & clean-up