DP-174 Fixed rubocop errors