Minor adjustments on code beauty