Organized imports, added some extra logging