minor cleaning on the code