cleaned up files + names