clean up, margins