Cleand upp and renamed variables and project