Edited code layout