code improvements
code improvements
cleaning
small improvements