More file and code cleaning