Updates

Cleaned up code and views