Cleaned up Register-View