Improve shell setup