reorder comment + cleanup