Refactring.