improve methode and class names