fix shell provider, also clean up a bit

Authored by sandsmark on Aug 18 2018, 11:18 AM.