CH-921 by Zarabadoo: Make comments clearer and streamline functionality based on code review.