[#189] Reformat logic and file - no behavior change