Minor adjustments to the coding style