make code clean
make changes according to quality tool