DP-125 Removed all rubocop formatting errors