Minor modifications for code clarity
Changed some vars to vals