BEM - code improvement