Additional cleanup

Just some minor clean up I missed from the first PR.