Resolve rubocop warnings