naming/comment tweak