Fixed problems with coding standard