Demo cleaning, added minimize.