Fix code layout