refactor Depends and another hlint