Refactoring. Preparation for YAML serialization.