Fix style conventions warnings