Minor cleanup of views