improved commenting and naming