code Clean-up