Fixed some of rubocop issues