To diff fileformat code clean up and tests