Clean up per PeterJCLaw's comments