changes to many files to clean them up everything still works