Revert "Refactoring"

This reverts commit a42d261c2d1da62e5728201d3aede10c5fefbc1a.