fix format and cleanup after commit 6c666be