Cleaned up views and testing