small code improvements
small code improvements