Made scripts more readable and removed old viewer