cleanup group code
nicify code
reduce number of find_node_by_name calls