[refactoring] removed redundant code and unnecessary type parameters
Merge pull request #5 from zaki50/refactoring

[refactoring] removed redundant code and unnecessary type parameters