Organized and cleaned plugins