cleaning up the methods and seo optimizations