Clean up views and logic