move code around