Nicer fonts
Removing not used code
Brushing up