Minor Updates

Minor Code improvements