some more restyling for readability