fix review comments
remove generic things from method signature
fix method signature