improve names of methods and class