Minor clean up.
Saving this for backup. not because it's used anywhere.