Clean up code in different file formats