Make some changes in style following Anders standards