remove "private" modifier
make some minor changes