Some cleanup on the views