cleanup code layout