Little cleanup in views