Issue #396: Code formatting
Closes #434