Cleaned up dataset view