Minor clean up
Minor clean up