Minor clean up #2