deleted unused member variables, refactored some names