Structure cleanup in views