Tidied imports and removed all warnings