Some maintenance. Names, functions name, class names, unused code