made some codecleaning