change naming convention and add comments