Organized imports and fixed list methods.