some cleanup in views