Keep context manager block small, tight, & focused (#535)
Keep context manager block small, tight, & focused (#535)

* Keep context manager block small, tight, & focused

* Simplify code

* Format comment
brainix/pottery