work code cleanup and enforcing calling privileges with properties