Some whitespace fixing and also fixed the plugin.yml appearing