2.8.1 experimental style

Some styling stuff that could improve readability.