Switching away from resource
Removing extra spaces