un-export internal variables
fix poorly named receivers
Add missing comment