Cleaned up commented code, implemented single example type views.