Minor Tweaks left

Minor Tweaking left