More readable style

A bit more line spacing and some other small fixes