code Cleanup