Updated for cleanliness of comment code