Can we avoid the inline styles here and on L79?