fix format and cleanup after commit b06672a