Incorporate changes suggested by guide