Tiny style changes to some imports