Removed redundant code
Removed more redundant code
Moved generics to title block
Merge pull request #23 from Code4SA/generic

Generic