Simplify code layout