Code formatting changes, after ORG mode conversion.