fix inconsistent naming
clean unused methods