clean up markup and focus structure around content