Revert "Setters and Getters"

This reverts commit d1d74e366e860d609e8323e286e3f92ae4715f6d.
Clone and push