switched shell to pry and more code clean up