routine name correction, comment fix, further compaction