[changed] some cleanup in classess