[class] const variables, rename functions, remove unnecessary closure functions