source format cleanup