Margin clean up