- moved vars to const