clean up margins and spacing