Organized imports and cleaned up a bit