CH-908 by Zarabadoo: Simplify script based on code review.