Minor - Refactored conditions out into methods in PluginService.cs