small code layout refactor