Small bits of tidying up.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 8766cf76..39e78baa 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -58,16 +58,17 @@
 #include <boost/algorithm/string.hpp>
 
 
-using std::string;
+using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
-using std::pair;
 using std::make_pair;
-using std::cout;
+using std::make_shared;
+using std::pair;
 using std::set;
-using std::vector;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
-using std::dynamic_pointer_cast;
 using namespace dcp;
 
 
@@ -291,9 +292,9 @@ CPL::read_composition_metadata_asset (cxml::ConstNodePtr node)
 		/* If the first language on SubtitleLanguageList is the same as the language of the first subtitle we'll ignore it */
 		size_t first = 0;
 		if (!_reels.empty()) {
-			shared_ptr<dcp::ReelSubtitleAsset> sub = _reels.front()->main_subtitle();
+			auto sub = _reels.front()->main_subtitle();
 			if (sub) {
-				optional<string> lang = sub->language();
+				auto lang = sub->language();
 				if (lang && lang == sll_split[0]) {
 					first = 1;
 				}
diff --git a/src/reel_encryptable_asset.cc b/src/reel_encryptable_asset.cc
index feb71b59..82dc9c89 100644
--- a/src/reel_encryptable_asset.cc
+++ b/src/reel_encryptable_asset.cc
@@ -59,7 +59,7 @@ ReelEncryptableAsset::ReelEncryptableAsset (optional<string> key_id)
 
 
 ReelEncryptableAsset::ReelEncryptableAsset (shared_ptr<const cxml::Node> node)
-	: _key_id (node->optional_string_child ("KeyId"))
+	: _key_id (node->optional_string_child("KeyId"))
 {
 	if (_key_id) {
 		_key_id = remove_urn_uuid (*_key_id);