Minor code adjustments

Minor code adjustments