addressing codereview, mainly cleaning up my lazy namings and insufficient comments