Clean up markup, convert to BEM