Refactoring some structures.