fixed some code layout