Code refactoing.