removed the class and some small improvements