Minor adjustments

Minor adjustments to standardization of the code.