Added some spaces and removed plugin-specific things