Clean up markup & styles