Refactored guide