Some syntax change base on rubocop