Cleaning up lifting code