Minor clean up and additions