#16 Improved visualization for scope