Refined ordering in coverage tables + cleanup