Tidied some imports