Reformatted code layout