fixing comments and refactoring GenericStaticMethod