clean up for layout