Fix bad code layout