Added better formatting to some imports