Fix code layout for other vars