Rename variable to better fit its purpose
Remove duplicate files