Restyle the interface and perform some light code cleanup