Improve method closure