diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp
index 55ee30d0ff..df6fb2350e 100644
--- a/src/LedgerFormats.cpp
+++ b/src/LedgerFormats.cpp
@@ -6,32 +6,32 @@
 LedgerEntryFormat LedgerFormats[]=
 {
 	{ "AccountRoot", ltACCOUNT_ROOT, {
-		{ S_FIELD(Flags),				STI_UINT32,  SOE_FLAGS,    0 },
-		{ S_FIELD(Account),				STI_ACCOUNT, SOE_REQUIRED, 0 },
-		{ S_FIELD(Sequence),			STI_UINT32,  SOE_REQUIRED, 0 },
-		{ S_FIELD(Balance),				STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(LastReceive),			STI_UINT32,  SOE_REQUIRED, 0 },
-		{ S_FIELD(LastTxn),				STI_UINT32,  SOE_REQUIRED, 0 },
-		{ S_FIELD(AuthorizedKey),		STI_ACCOUNT, SOE_IFFLAG,   1 },
-		{ S_FIELD(EmailHash),			STI_HASH128, SOE_IFFLAG,   2 },
-		{ S_FIELD(WalletLocator),		STI_HASH256, SOE_IFFLAG,   4 },
-		{ S_FIELD(MessageKey),			STI_VL,		 SOE_IFFLAG,   8 },
-		{ S_FIELD(TransitRate),			STI_UINT32,  SOE_IFFLAG,  16 },
-		{ S_FIELD(Extensions),			STI_TL,		 SOE_IFFLAG,   0x01000000 },
-		{ sfInvalid, NULL,				STI_DONE,	 SOE_NEVER,    -1 } }
+		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
+		{ S_FIELD(Account),				STI_ACCOUNT,	SOE_REQUIRED, 0 },
+		{ S_FIELD(Sequence),			STI_UINT32,		SOE_REQUIRED, 0 },
+		{ S_FIELD(Balance),				STI_AMOUNT,		SOE_REQUIRED, 0 },
+		{ S_FIELD(LastReceive),			STI_UINT32,		SOE_REQUIRED, 0 },
+		{ S_FIELD(LastTxn),				STI_UINT32,		SOE_REQUIRED, 0 },
+		{ S_FIELD(AuthorizedKey),		STI_ACCOUNT,	SOE_IFFLAG,   1 },
+		{ S_FIELD(EmailHash),			STI_HASH128,	SOE_IFFLAG,   2 },
+		{ S_FIELD(WalletLocator),		STI_HASH256,	SOE_IFFLAG,   4 },
+		{ S_FIELD(MessageKey),			STI_VL,			SOE_IFFLAG,   8 },
+		{ S_FIELD(TransitRate),			STI_UINT32,		SOE_IFFLAG,  16 },
+		{ S_FIELD(Extensions),			STI_TL,			SOE_IFFLAG,   0x01000000 },
+		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ "DirectoryRoot", ltDIR_ROOT, {
-		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,    0 },
+		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
 		{ S_FIELD(FirstNode),			STI_UINT64,		SOE_REQUIRED, 0 },
 		{ S_FIELD(LastNode),			STI_UINT64,		SOE_REQUIRED, 0 },
 		{ S_FIELD(Extensions),			STI_TL,			SOE_IFFLAG,   0x01000000 },
-		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,    -1 } }
+		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ "DirectoryNode", ltDIR_NODE, {
-		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,    0 },
+		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
 		{ S_FIELD(Indexes),				STI_VECTOR256,	SOE_REQUIRED, 0 },
 		{ S_FIELD(Extensions),			STI_TL,			SOE_IFFLAG,   0x01000000 },
-		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,    -1 } }
+		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ "GeneratorMap", ltGENERATOR_MAP, {
 		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
@@ -41,24 +41,24 @@ LedgerEntryFormat LedgerFormats[]=
 		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ "Nickname", ltNICKNAME, {
-		{ S_FIELD(Flags),				STI_UINT32,  SOE_FLAGS,    0 },
-		{ S_FIELD(Nickname),			STI_HASH256, SOE_REQUIRED, 0 },
-		{ S_FIELD(Account),				STI_ACCOUNT, SOE_REQUIRED, 0 },
-		{ S_FIELD(MinimumOffer),		STI_AMOUNT,  SOE_IFFLAG,   1 },
-		{ S_FIELD(OfferCurrency),		STI_HASH160, SOE_IFFLAG,   2 },
-		{ S_FIELD(Extensions),			STI_TL,		 SOE_IFFLAG,   0x01000000 },
-		{ sfInvalid, NULL,				STI_DONE,	 SOE_NEVER,    -1 } }
+		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
+		{ S_FIELD(Nickname),			STI_HASH256,	SOE_REQUIRED, 0 },
+		{ S_FIELD(Account),				STI_ACCOUNT,	SOE_REQUIRED, 0 },
+		{ S_FIELD(MinimumOffer),		STI_AMOUNT,		SOE_IFFLAG,   1 },
+		{ S_FIELD(OfferCurrency),		STI_HASH160,	SOE_IFFLAG,   2 },
+		{ S_FIELD(Extensions),			STI_TL,			SOE_IFFLAG,   0x01000000 },
+		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ "RippleState", ltRIPPLE_STATE, {
-		{ S_FIELD(Flags),				STI_UINT32,  SOE_FLAGS,    0 },
-		{ S_FIELD(Balance),				STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(LowID),				STI_ACCOUNT, SOE_REQUIRED, 0 },
-		{ S_FIELD(LowLimit),			STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(HighID),				STI_ACCOUNT, SOE_REQUIRED, 0 },
-		{ S_FIELD(HighLimit),			STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(AcceptRate),			STI_UINT32,  SOE_IFFLAG,   1 },
-		{ S_FIELD(Extensions),			STI_TL,      SOE_IFFLAG,   0x01000000 },
-		{ sfInvalid, NULL,				STI_DONE,    SOE_NEVER,    -1 } }
+		{ S_FIELD(Flags),				STI_UINT32,		SOE_FLAGS,	  0 },
+		{ S_FIELD(Balance),				STI_AMOUNT,		SOE_REQUIRED, 0 },
+		{ S_FIELD(LowID),				STI_ACCOUNT,	SOE_REQUIRED, 0 },
+		{ S_FIELD(LowLimit),			STI_AMOUNT,		SOE_REQUIRED, 0 },
+		{ S_FIELD(HighID),				STI_ACCOUNT,	SOE_REQUIRED, 0 },
+		{ S_FIELD(HighLimit),			STI_AMOUNT,		SOE_REQUIRED, 0 },
+		{ S_FIELD(AcceptRate),			STI_UINT32,		SOE_IFFLAG,   1 },
+		{ S_FIELD(Extensions),			STI_TL,			SOE_IFFLAG,   0x01000000 },
+		{ sfInvalid, NULL,				STI_DONE,		SOE_NEVER,	  -1 } }
 	},
 	{ NULL, ltINVALID }
 };
diff --git a/src/Transaction.h b/src/Transaction.h
index e2dfa915ce..90cb1b934d 100644
--- a/src/Transaction.h
+++ b/src/Transaction.h
@@ -61,15 +61,15 @@ private:
 		const std::vector<unsigned char>&	vucSignature);
 
 	Transaction::pointer setCreate(
-		const NewcoinAddress&	naPrivateKey,
-		const NewcoinAddress&	naCreateAccountID,
-		const STAmount&			saFund);
+		const NewcoinAddress&				naPrivateKey,
+		const NewcoinAddress&				naCreateAccountID,
+		const STAmount&						saFund);
 
 	Transaction::pointer setCreditSet(
-		const NewcoinAddress&	naPrivateKey,
-		const NewcoinAddress&	naDstAccountID,
-		const STAmount&			saLimitAmount,
-		uint32					uAcceptRate);
+		const NewcoinAddress&				naPrivateKey,
+		const NewcoinAddress&				naDstAccountID,
+		const STAmount&						saLimitAmount,
+		uint32								uAcceptRate);
 
 	Transaction::pointer setPasswordFund(
 		const NewcoinAddress&				naPrivateKey,
@@ -83,17 +83,17 @@ private:
 		const std::vector<unsigned char>&	vucSignature);
 
 	Transaction::pointer setPayment(
-		const NewcoinAddress&	naPrivateKey,
-		const NewcoinAddress&	naDstAccountID,
-		const STAmount&			saAmount,
-		const STAmount&			saSendMax,
-		const STPathSet&		spPaths);
+		const NewcoinAddress&				naPrivateKey,
+		const NewcoinAddress&				naDstAccountID,
+		const STAmount&						saAmount,
+		const STAmount&						saSendMax,
+		const STPathSet&					spPaths);
 
 	Transaction::pointer setTransitSet(
-		const NewcoinAddress&	naPrivateKey,
-		uint32					uTransitRate,
-		uint32					uTransitStart,
-		uint32					uTransitExpire);
+		const NewcoinAddress&				naPrivateKey,
+		uint32								uTransitRate,
+		uint32								uTransitStart,
+		uint32								uTransitExpire);
 
 	Transaction::pointer setWalletAdd(
 		const NewcoinAddress&				naPrivateKey,
@@ -139,23 +139,23 @@ public:
 	// Create an account.
 	static Transaction::pointer sharedCreate(
 		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-		const NewcoinAddress&	naSourceAccount,
-		uint32					uSeq,
-		const STAmount&			saFee,
-		uint32					uSourceTag,
-		const NewcoinAddress&	naCreateAccountID,	// Account to create.
-		const STAmount&			saFund);			// Initial funds in XNC.
+		const NewcoinAddress&				naSourceAccount,
+		uint32								uSeq,
+		const STAmount&						saFee,
+		uint32								uSourceTag,
+		const NewcoinAddress&				naCreateAccountID,	// Account to create.
+		const STAmount&						saFund);			// Initial funds in XNC.
 
 	// Set credit limit and borrow fees.
 	static Transaction::pointer sharedCreditSet(
 		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-		const NewcoinAddress&	naSourceAccount,
-		uint32					uSeq,
-		const STAmount&			saFee,
-		uint32					uSourceTag,
-		const NewcoinAddress&	naDstAccountID,
-		const STAmount&			saLimitAmount,
-		uint32					uAcceptRate);
+		const NewcoinAddress&				naSourceAccount,
+		uint32								uSeq,
+		const STAmount&						saFee,
+		uint32								uSourceTag,
+		const NewcoinAddress&				naDstAccountID,
+		const STAmount&						saLimitAmount,
+		uint32								uAcceptRate);
 
 	// Pre-fund password change.
 	static Transaction::pointer sharedPasswordFund(
@@ -178,25 +178,25 @@ public:
 	// Make a payment.
 	static Transaction::pointer sharedPayment(
 		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-		const NewcoinAddress&	naSourceAccount,
-		uint32					uSeq,
-		const STAmount&			saFee,
-		uint32					uSourceTag,
-		const NewcoinAddress&	naDstAccountID,
-		const STAmount&			saAmount,
-		const STAmount&			saSendMax,
-		const STPathSet&		saPaths);
+		const NewcoinAddress&				naSourceAccount,
+		uint32								uSeq,
+		const STAmount&						saFee,
+		uint32								uSourceTag,
+		const NewcoinAddress&				naDstAccountID,
+		const STAmount&						saAmount,
+		const STAmount&						saSendMax,
+		const STPathSet&					saPaths);
 
 	// Set transit fees.
 	static Transaction::pointer sharedTransitSet(
 		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-		const NewcoinAddress&	naSourceAccount,
-		uint32					uSeq,
-		const STAmount&			saFee,
-		uint32					uSourceTag,
-		uint32					uTransitRate,
-		uint32					uTransitStart,
-		uint32					uTransitExpire);
+		const NewcoinAddress&				naSourceAccount,
+		uint32								uSeq,
+		const STAmount&						saFee,
+		uint32								uSourceTag,
+		uint32								uTransitRate,
+		uint32								uTransitStart,
+		uint32								uTransitExpire);
 
 	// Add an account to a wallet.
 	static Transaction::pointer sharedWalletAdd(