some code style improvements