Move code into appropriate place.