remove parameters doesn't use in function handle and refactor few lines