code improvements
code improvements