Cleaned up views and structure