Index: src/Common/PersistentMap.h
===================================================================
--- src/Common/PersistentMap.h	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ src/Common/PersistentMap.h	(revision 195d1d89c805c47fc486b2b8cf91431ffa3d0689)
@@ -23,11 +23,11 @@
 #include <utility>        // for forward, move
 
-/// Wraps a hash table in a persistent data structure, using a technique based 
-/// on the persistent array in Conchon & Filliatre "A Persistent Union-Find 
+/// Wraps a hash table in a persistent data structure, using a technique based
+/// on the persistent array in Conchon & Filliatre "A Persistent Union-Find
 /// Data Structure"
 
 template<typename Key, typename Val,
-         typename Hash = std::hash<Key>, typename Eq = std::equal_to<Key>>
-class PersistentMap 
+		typename Hash = std::hash<Key>, typename Eq = std::equal_to<Key>>
+class PersistentMap
 	: public std::enable_shared_from_this<PersistentMap<Key, Val, Hash, Eq>> {
 public:
@@ -38,5 +38,5 @@
 
 	/// Types of version nodes
-	enum Mode { 
+	enum Mode {
 		BASE,  ///< Root node of version tree
 		REM,   ///< Key removal node
@@ -63,5 +63,5 @@
 		Ptr base;  ///< Modified map
 		Key key;   ///< Key removed
-		
+
 		template<typename P, typename K>
 		Rem(P&& p, K&& k) : base(std::forward<P>(p)), key(std::forward<K>(k)) {}
@@ -155,5 +155,5 @@
 				auto it = base_map.find( self.key );
 
-				base->template init<Ins>( 
+				base->template init<Ins>(
 						mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
 				base->mode = INS;
@@ -175,5 +175,5 @@
 				auto it = base_map.find( self.key );
 
-				base->template init<Ins>( 
+				base->template init<Ins>(
 						mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
 				base->mode = UPD;
@@ -267,5 +267,5 @@
 	Ptr erase(const Key& k) {
 		reroot();
-		
+
 		// exit early if key does not exist in map
 		if ( ! as<Base>().count( k ) ) return this->shared_from_this();
Index: src/Common/VectorMap.h
===================================================================
--- src/Common/VectorMap.h	(revision 7a780ad23506507b6a1feccc46d18e12da183ceb)
+++ src/Common/VectorMap.h	(revision 195d1d89c805c47fc486b2b8cf91431ffa3d0689)
@@ -36,13 +36,11 @@
 	typedef const value_type* pointer;
 	typedef const const_value_type* const_pointer;
-	
-	class iterator : public std::iterator< std::random_access_iterator_tag,
-	                                       value_type,
-										   difference_type,
-										   pointer,
-										   reference > {
-	friend class VectorMap;
-	friend class const_iterator;
-	
+
+	class iterator : public std::iterator<
+			std::random_access_iterator_tag,
+			value_type, difference_type, pointer, reference > {
+		friend class VectorMap;
+		friend class const_iterator;
+
 		value_type data;
 
@@ -99,5 +97,5 @@
 			return data.first == o.data.first && &data.second == &o.data.second;
 		}
-		
+
 		bool operator!= (const iterator& that) const { return !(*this == that); }
 
@@ -111,10 +109,8 @@
 	};
 
-	class const_iterator : public std::iterator< std::bidirectional_iterator_tag,
-	                                             const_value_type,
-												  difference_type,
-												  const_pointer,
-												  const_reference  > {
-	friend class VectorMap;
+	class const_iterator : public std::iterator<
+			std::bidirectional_iterator_tag,
+			const_value_type, difference_type, const_pointer, const_reference > {
+		friend class VectorMap;
 		const_value_type data;
 
@@ -181,5 +177,5 @@
 			return data.first == o.data.first && &data.second == &o.data.second;
 		}
-		
+
 		bool operator!= (const const_iterator& that) const { return !(*this == that); }
 
@@ -233,12 +229,14 @@
 
 template<typename T>
-typename VectorMap<T>::iterator operator+ (typename VectorMap<T>::difference_type i, 
-                                           const typename VectorMap<T>::iterator& it) {
+typename VectorMap<T>::iterator operator+(
+		typename VectorMap<T>::difference_type i,
+		const typename VectorMap<T>::iterator& it) {
 	return it + i;
 }
 
 template<typename T>
-typename VectorMap<T>::const_iterator operator+ (typename VectorMap<T>::difference_type i, 
-                                                 const typename VectorMap<T>::const_iterator& it) {
+typename VectorMap<T>::const_iterator operator+(
+		typename VectorMap<T>::difference_type i,
+		const typename VectorMap<T>::const_iterator& it) {
 	return it + i;
 }