Cleaned up, order by ID