minor cleaning of code