Convert remaining instance class methods to functions