Refactored advice functions