Updated code layout