remove a few therefores and be consisteng about plug-in vs plugin