Readjusted code layout