Refactor entry block into BEM format