removed helper method, refactor params