Issue #64, fix formatting