Cleanup and specs
Views
~!