Unifying the program flow and colors and eliminating some unnecessary stuff