some small code style improvements