removed useless data members, added documentation