some minor changes

code tdying