visibility cleanup, docs