const cleanup round 1(commentary on what I found)