renamed some attributes and methods, deleted old comments