code style improvements