Minor clean up
Clean up