Refactor Properties Change to Private