code cleanup
update matcher