Cleaned up View Records

Cleaned up View Records