finished guide command refactoring