Clean up construction in different file formats