Minor code quality changes