Commented and refined