removed camalCasing in popular vars; updated todo