change function invocation syntax
add function name keyword validation
removed unused classes