More guidance cleanup

Fixes #167
Merge pull request #173 from pjackson28/moreguidancecleanup

More guidance cleanup