markup and style cleanup