Add slight changes

Add some minor structural changes to the function block identification