More re factoring.