Separate out context manager to bottom; add in-text references, cleanup