Make code more self-describing as suggested in PR Comments