better member names, removed unused code