Some file and syntax cleanup