fixed: first round of fixes based on the initial review
changed: handing index command output
fixed: naming conventions, variable comments