Move code properly