Code re factoring.