Passing of generic closures should be static
Transform of coding style to be more Pascal like
Also more pascalified
Little comment adjustment