List order fixes / code cleanup