issue#62 Code review fixing