Minor adjustments on code formatting