[changed] cleaned the rest up