More guidance cleanup

Fixes #167