use format instead of percent + some changes in the header of files
cleanup in header of files