Minor code style improvements