spacing and use dictionary for plugin searching
fix more spacing, version 3 cleanup, and more common cleanup
Merge pull request #1 from Nijikokun/master

General Cleanup & Code Optimizations thanks to @Nijikokun