Removed updated_path - unused variable, and some clean up of code.