minor cleaning in the code