better code layout