Issue #32 Code formatting modifications.