minor cleaning in code