fixed commenting and naming