Data structure refactoration.