Added visitor methods and improved tool grammar