Cleaned up files for modification