Clear up code in different file formats