more cleaning of code