Move code inside relevant block [RD-44]