Adjust some code layout