style: tweak names and add comments