code formatting cleanup, remove unnecessary cloning on load