Some final commenting cleanup