change code according to codenarc
some tests
Start fix
some tests