Refactoring
Revert "Refactoring"

This reverts commit dfa601110a2d3b0187d673a6e876a1b9d6ef6271.