improved viewers,removed unused code