+ * Some better source code formatting/wrapping in a few places.