slight styling, fixing some NPEs