Margin cleanup