cleaned up client view