[SS] some shell resctructuring