refactor some atribute names, add comments