[changed] a bit more cleanup