* implemented trivial code changes necessary batch of rules Co-authored-by: Andrew Henry <akhenry@gmail.com>