Implemented Refactor class Shell #81