Slightly less mess