gitfiles
renamed some vars
improve