Code simplification.
Code simplification.

mockingbirdnest/Principia,mockingbirdnest/Principia,mockingbirdnest/Principia,pleroy/Principia,pleroy/Principia,pleroy/Principia,mockingbirdnest/Principia,pleroy/Principia