Revert "change to one line get/set"

This reverts commit b070c1161db35f6c589be1a0033cdef0645365e2.