Cleanup cleanup cleanup.... and a bit SEO ;)