Clear up code in various file formats