Just modify code layout