some cleaning of code