Improve codestyle (also add some BEM)