Issue #18: update code formatting