Fixed asc sort and cleaned up.