Re-factor existing code.