explicit returns in guide function
Minor style tweak and refactor