Minor code standards adjustments

Minor code standards adjustments