minor cleaning of the code