Issue #73 - View cleanup