Revert "Refactoring"

This reverts commit 9f40bae8354fa67fa5e4ba9dd0cfa3c73445fd8d.
Pushed down setters