cleaned up several views