Small code style improvements