Fixed code layout